Remove erroneously-committed merge comment.
authorReuben Thomas <rrt@sc3d.org>
Fri, 18 Oct 2013 08:48:33 +0000 (09:48 +0100)
committerReuben Thomas <rrt@sc3d.org>
Fri, 18 Oct 2013 08:48:33 +0000 (09:48 +0100)
commit00e7a2cc18da0ca8327764985bd8b8a53daf2772
tree0a7071505b755c9a56dcb4598df9b4ffe0b0b417
parent648530fbaf771ab7d3df4b03312482ac58cc98a5
Remove erroneously-committed merge comment.
lisp/ChangeLog